Added tidier .entrypoint section