Added importance of consistency, cleaned up naming conventions