remove "old school" return statements