FIX (src): Small refactoring