removed double return null; formatting