#383 Improved naming and coding style