Tidy up style adding functionality.