Clean up

Copyright, compile, test, remove trailing spaces