Cleanup code, add comments, add some specs