Bug squashing and trying to fix formatting.