Refactored code base and add info