Removed if-s