Refactored some code-readability issues to be fixed.