Cleaned up code, no changes