Major clean up and greek letters