Remove space lines and switch header file order to improve readability