Removed unwanted code and find formatting