Best practices minor improvements