added alignment to the columns and cleaned up from some botched merges
cleaning up source code