Polished existing branch develop. Removed code that did not respect basic conventions.