cleaned up code and started adding nice borders