Code cleanup/bugfixes