Cleaned a little bit, will merge to master.