Minor style changes + CLIMS type

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>