removed useless returns at the end of methods