Added mechanism to init service layer (not used yet)
Cleaned up code in main module file and utils to pass LINT