bg added + code cleaning