Change Log:
Cleaned up code