favicon + code cleanup