Made the source code a bit cleaner.