Updated style and started mocking manual