Finished cleanup and introduced uniformity