Temporary style fix until a refactor can be made