Clean code, fix bugs [v1.1.5]