Cleanup abit and added SFML