Refactoring, formating and add disclaimer