Code cleanup, first compiling test.