more refactoring, using Assert (vs assert), annotations, removing portrait for phone