Frontend Devel

- Code Cleanup