Removed unnecessary if's in methods.