Pretty up the code