Cleaning up long lines and unneded code