Issue #11: indent and clean code