Removed whitespaces. Cleaned up some methods.