Code style cleanup and final test