Made stuff more readable (?)