Code alignment

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
Merge remote-tracking branch 'origin/master'