Clean up code style

Move dependencies into role
Move OTP data role out of OTP role