Removed 'if' statements