Updated paths and formatting