Refactored acouple more things

Signed-off-by: retep998 <retep998@verizon.net>