code style
Tidy status and returns