Refactor

Codes got refactor and added information for SEP report