Cleaned up for pushing to github