Removed unneeded code, formatting and selectors