Cleaned up the conditionals here. Instead of relying on "else" set a default and modify/append as necessary.