cleaning code and check style