Started to dress up the code