Making a commit and tidying up code.