Cleaning code and fixing small issue with camara centering