Clean up and merge

Signed-off-by: Antes <malinbay@gmail.com>