cleaned up statement and spacings