Cleaned up some code, no changes