Cleans up code a little bit via Objclean