Cleaning up code. Adding comments. Removing old file