Issue #223 fix method
Issue #223 fix indentation
Issue #223 fix layout