Cleaning up my acont abit