Simple cleanup and made the code look consistent.