Clean up

Cleaned up code:
- getSalary now returns BigDecimal ** MAKE SURE TO ASK ABOUT **