changed spacing, moved code