cleaned up some code. More concise.