More conditionals to clean up the code