Made minor restructuring