Final Cleaning

Cleaned up syntax + added comments.