- cleaned up code for GitHub