slight refactor and directional light