Issue #425 fixed indentation &code conventions