cosmetic changes, removed redundant lines