Cleaned up commented code and ready to edit