Cleaned up code, no new functionality