Code now follows Orxata Studios code conventions