Minor code formatting and coding to interfaces + naming