cleaned up scope usage and styling