Cleaned up the code before going further.