Added default opacity.
Code cleaning;