Cleanup and added py/venv hooks