Improved readability, JSHint adherence, fix tab vs. space formatting