includes

cleanup, changed some if statements to use brackets, organization,
indentation