Updated module to comply with indentation standard and to use suggestions from reviewers