Removed empty lines and one if that is not needed anymore