FIX: Clean up a little bit