Slowly changing the appearance and cleaning up the code.