Done some code formatting for readability