Fix comment form label position
Clean up code