Improved conformance to common DRY project conventions.