changes based on comments
fixed some more indentation stuff