removed redundant dirs and whitespace