code clean up and mobile adj