Formatted code and removed extraneous file and routines