Simplified loose/tight logic. Closes #50