do not bother with aligning variable declaration, clean up multiple declarations per line to one only and add the correct type