Code refactoring and small volume bar changes