cleaning up the frontend code
cleaning up the frontend code