Some cleanup. Removed comments.