fixed indentation and added more includes