Cleaning of codebase, made it working