Refactored, added space, boolean literals, condensed test