Removing trash
Re-indenting