Some basic changes to code
Change-Id: I21cb08c50f5fee7028a6640a9e54a26da8111ed4
Signed-off-by: ramnar <raam.soft@gmail.com>