COMPLETE, Imporved formatting
Done functions