Spaces, useless casting, etc.