Finished up class maps and cleaned up