Cleaning: spacing and IDE helper