Sorting out readability, indentation was way off