added borders, removed unnnecessary code