Code cleanup and more use of native Elementary items