Final changes and edits + code clean up and validation