Cleaned up some code, nothing major.