further code clean up in Frontend