Code cleanup. Front end working!