Cleanup code, add comments, add profile view