Made it prettier and cleaned up directory