code cleanup and added craptastic icon to see how it works