Finished tweaks for best practices.