Cleaned up code, since power is held internally now