Add comments and refactor some CSS rules