Cleaned code - final commit 2/19/14