#24 Clean warnings
#25 Check code style