Clean up
Variable init, added const, clean up
Variable init