cleanup for a little better readability