Fix issues found by reader

Signed-off-by: Michael LeCompte <michaelslec98@gmail.com>