Cleaned up the code from UI branch