Some tidying up and possible implementation of facing the satellite at origin