Small refactor of phong code; code cleanup;