removed return null's
clean up