Device modifying; Cleaning code: reorganizise code, change methods' name