Cleaned more code

More code cleaning... Tested by running app