Cleaned up source code, added names and comments

Deleted any TODO comment, added our names, cleaned up the code syntax.