FIX: code clean up