format and cleanup :)