Code clean up and add launcher icon