Just some code improvments.