first commit
Fix indentation.
clean a bit
simplify a bit