Better return statements pls