Removed comments, more code tidying.