Cleaned up formatting, readability and strange syntax