IDE helpers added; slight formatting