Just some basic commenting and removing obsolete coding