Fixing Format and removing old code.