Can you remove these functions that aren't necessary, and extra whitespace lines?