Refactoring the code!
Refactoring the code, added maps back in!
small updates