Code/readability cleanup on sources directory

Signed-off-by: ziycon <ziycon.eire@gmail.com>