Cleaned up code and added custom launcher icon