renamed files
added labels, corrected indentation
code optimized, corrected indentation