Updated for code standards