#895 Revamp System info to include more information
#916 Coding conventions improvement