Refactored some coding errors