possibly final commit. files cleaned and formatted