Cleanup, started on fixing HashMap