fixed src attr issue + cleaned up a bit