Nice, changed it. It made the code much cleaner.