Cleaned front-end code