cleanup and improved return statement
commented out test (currently out of scope to test via faces contexts)