Restyling and remove unused code.