Everything working, comments and cleanup