Cleaned up code to be more consistant with SFMLs code