Cleaned up init code.

commit c59864f9d4a67dcf76ba01d9c4db2b12fada6339 mainline

There was lot of clutter and misleading comments in the code
and some minor coding convention issues. This patch cleans up
init.c for the most part.