Cleaning and cleaning

Signed-off-by: Steven Chennault <schenn@gmail.com>
Signed-off-by: Steven Chennault <schenn@gmail.com>
Signed-off-by: Steven Chennault <schenn@gmail.com>
Signed-off-by: Steven Chennault <schenn@gmail.com>
Merging

Signed-off-by: Steven Chennault <schenn@gmail.com>