cleaned up some more, better allignment