Cleanup coding conventions; Fix typo