Added logo and code cleanup