Applying general best practices