Clean up the code .. Expand method.