Code Cleanup:
- Change the HashMap declaration to Map
- Put the [] to Variable type instead on the variable name
- Merge nested if's to one boolean condition

Reviewer: Mae Isabelle Turiana