minor code/comment changes/cleanup + refined app icons