Lunch Code Dump

code cleanup, comments, and organization