Cleaned up Double code a bit