cleaned up formatting
removed "where" option
added documentation