cleanup & corrected camera position in space
better performance and code structure