Reviewing code; cleaned unused parts; unified names