Code clean up, added mobile base