Reduced lines of code a bit here and there.