Cleanup the code by removing unecessary blanks lines and unused properti...