Cleaned up code and changed launcher icon