3824 Pretty up the code