cleaned up files according to style spec. ready for submit