Cleaned up and uncommented some code