Removed 'return false;' where unnecessary