did some minor cleanup TODO fix side margins