Un-messified the code.