Happy New Year 2014 and code cleanup