Made Headless follow coding guidelines.