Cleaned up the code. Nothing major.