reorganizing methods
reorganizing headers, extracting strings