Source Cleanup and Optimize....

Signed-off-by: pyramid-X <rdxperiaz@gmail.com>