Bryk code cleanup

I'm requesting this simple pull request just to test this feature. @Mequrel can you review it?