2014-12-28: Code cleanup