Cleaned up code formatting a bit :)